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