Rel18 integration branch contents from 154 meeting merge to Rel19 YAML integration branch See merge request !1112