merge array collection items when reverting layout blocks
Merge branch 'master' into 2.5