optimise loading of content in the layout block object
Merge remote-tracking branch 'origin/master' into 2.3