Merge branch 'split_rendering_masa_and_mc_fixes' into 'main'

[split-non-BE][non-BE] Fix for #627 Split Rendering outstanding tasks

See merge request !865