Merge branch 'revert-640ff5a4' into 'Integration_Rel19_SA5_162_YAML'

Revert "Code Moderator manually merge MR1834"

See merge request !1891