The change in this MR is done via commit: 9909ffa8 on integration branch directly due to multi-level of confliction. Hence this MR is not required.