Merge branch 'main' into isar_selection_branch_cleanup