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

[non-BE] Resolve "Object editing output not BE between 5/10/20 rendering in non-JBM"

See merge request !1952