Merge branch 'Integration_Rel16_SA5_142_YAML' into 'Integration_Rel16_SA5_143_YAML'

Integration rel16 sa5 142 yaml merge to 143 yaml integration branch

See merge request !328