Merge branch '766-split-rendering-missing-in-omasa' into isar_selection_branch