First pass of support for 1.7.2 block rendering