Revert "Merge branch 'feature/box-without-corner-storage' into 'master'"

This reverts merge request !3199
5 jobs for !3200 with revert-959218fe
latest merge request