Merge branch 'block_container_override'