HIPPOTHEME-25:
Includes fixes for pane grid. Also includes the following commit: 93987d6662e90673c626c31361be630371a5ed73