Merge branch '1330_basop_split_rendering_porting' into kiene/add-split-rendering-ci-to-basop-sr-branch