Fix layout block content problem
Merge branch 'master' into 2.5