Merge branch 'Integration_Rel19_SA5_154_YAML' into 'Integration_Rel19_SA5_155_YAML'

Rel18 integration branch contents from 154 meeting merge to Rel19 YAML integration branch

See merge request !1112