Merge branch 'Code_Moderator_rebase_Integration_Rel18_SA5_162_YAML' into 'Rel-18'

[Code Moderator]Merge Integration_Rel18_SA5_162_YAML to Rel-18 after manually rebase

See merge request !1900