Merge branch 'Code_Moderator_rebase_Integration_Rel20_SA5_162_YAML' into 'Rel-20'

[Code Moderator]Merge Integration_Rel20_SA5_162_YAML to Rel-20 after manually rebase

See merge request !1902