Remove broken layout assumptions in regression test
Merge branch 'hotfix/BETA3_HOT01'