Remove margin between blocks for container block edition
Merge branch 'ActionItem2738' into stable