Merge branch 'main' into 1427-object-editing-do-not-support-extended-metadata