Port MR 2337 from float

Sumeyra Demir Kanikrequested to merge
2192-port-mr2337-from-float-non-be-resolve-object-editing-do-not-support-extended-metadata into main

Closes #2192 (closed) Ports MR !2337 (merged) from float

Merge request reports