Revert "Merge branch 'cr/TS103221-1/030' into 'master'"

This reverts merge request !51
1 job for revert-76ba5525
in 27 seconds, using 0 compute credits, and was queued for 3 seconds