Merge branch 'Code_Moderator_rebase_Integration_Rel19_SA5_162_YAML' into 'Rel-19'

[Code Moderator]Merge Integration_Rel19_SA5_162_YAML to Rel-19 after manually rebase

See merge request !1901