Merge branch 'Integration_Rel18_SA5_165_YAML_Manually_Rebase_By_CodeModerator' into 'Rel-18'
Integration_Rel18_SA5_165_YAML_Manually_Rebase_By_CodeModerator See merge request !2053
Integration_Rel18_SA5_165_YAML_Manually_Rebase_By_CodeModerator See merge request !2053