Fixing bug with wrong layouts causing fields belonging to other layout being assigned to the block (and chrashes)
Merge branch 'fixes/block-illegal-layout-js'