Merge branch 'wip_m_MDL-29178_fix_block_naming_inconsistencies' of git://github.com...