layout names fixed in assertions
Merge branch 'release/layout-test-assertions-fix'
Merge tag 'layout-test-assertions-fix' into develop

v1.63