Port MR1947 and MR1952 from float - Object editing broken in JBM

Basic Info

• Original merge request in float repo: ivas-codec-pc/ivas-codec!1947 (merged) and ivas-codec-pc/ivas-codec!1952 (merged)