Merge "Removing BLOCK_TYPES and adding PLANE_TYPES constant instead."