Merge branch 'Integration_Rel16_SA5_140_YAML' into 'Rel-16'

merge 139e and 140e Rel16 contents from integration branch to Rel16 release branch for yaml

See merge request sa5/MnS!242