Merge remote-tracking branch 'remotes/origin/main' into shared/api-object-editing