Merge branch 'main' into 2192-port-mr2337-from-float-non-be-resolve-object-editing-do-not-support-extended-metadata
