Merge remote-tracking branch 'origin/main' into obj-edit-fixes-1399-1400