Revert "Merge branch 'cr/103221-1/032' into 'master'"

This reverts merge request !60
1 job for revert-24bec5c1 in 34 seconds (queued for 6 seconds)