Merge branch 'filling-in-layout'

Status Job ID Name Coverage
  Build
failed #3701
build

 
  Test
skipped #3703
allowed to fail
codequality
skipped #3702
test
 
Build build
No job trace