Merge branch '2134-basop-PortMr1769-from-float-fix-issues-in-obj_editing' into 'main'

Port MR1769 from float to BASOP - Fix issues in OBJ_EDITING

Closes #2134

See merge request !2416