Merge branch 'Integration_Rel20_SA5_165_YAML_Manually_Rebase_By_CodeModerator' into 'Rel-20'
Integration rel20 sa5 165 yaml manually rebase by codemoderator See merge request !2055
Integration rel20 sa5 165 yaml manually rebase by codemoderator See merge request !2055