Merge branch 'revert-f29523ad' into 'Integration_Rel19_SA5_162_YAML'

Revert "Code Moderator manually merge MR1810"

See merge request !1890