[Maintenance] Align code in master with UAT
The master branch does not include this code changes that all other branches contains.
So this MR is to align the code differences in order to have master branch in the same state as the others.
The master branch does not include this code changes that all other branches contains.
So this MR is to align the code differences in order to have master branch in the same state as the others.