Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Issue #8446 by cableman: Fixed issue with headers in blocks
Merge branch 'master' into development