Merge branch 'object_editing_align_basop' into 'main'
Back-port object editing changes from basop See merge request !2311
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Back-port object editing changes from basop See merge request !2311