Merge branch '1255-object-editing-broken-in-jbm' into 'main'

[non-BE] Resolve "Object editing broken in JBM"

See merge request !1947