Merge remote-tracking branch 'remotes/origin/main' into 1255-object-editing-broken-in-jbm-2