Merge branch 'main' into obj-edit-fixes-1399-1400