Merge branch 'revert-9db832c7' into 'Integration_Rel19_SA5_162_YAML'

Revert "Code Moderator manually merge the MR1884"

See merge request !1892