Merge branch '1119-split-rendering-crashes-in-jbm' into 1119-split-rendering-crashes-in-jbm-tests