merge 139e and 140e Rel16 contents from integration branch to Rel16 release branch for yaml See merge request !242