Merge branch 'split_rend_fixes_mc_ism' into 'main'

[split-non-be] Adding in fixes for split rending on mc and ism

See merge request !1309