Revert "Merge remote-tracking branch 'origin/Sroca' into SGA-IT"

This reverts commit 894aab55292167a522d513c3121abf8e8787e32f, reversing
changes made to a4e5cf706569641c4205cba76411d0a3847ddb4d.