Merge branch 'obj-edit-fixes-1399-1400' into 'main'

[Non-BE] Fix object editing issues 1399 and 1400

See merge request !2268