Merge: from remove_old_occlusion_group_logic - Clean: more code removal in unit tests to silence Rider Tests: ran unit tests