Merge branch 'object_editing_align_basop' into 'main'

Back-port object editing changes from basop

See merge request !2311