TMSS-951: Partially Completed
Code changes in this branch is required for some other tickets. Hence need to merge this change and this ticket work will be continued after the dependency is cleared.
Code changes in this branch is required for some other tickets. Hence need to merge this change and this ticket work will be continued after the dependency is cleared.