Merge branch 'main' into 2148_obj_edit_issue_with_osba
# Conflicts: # lib_com/options.h
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.
# Conflicts: # lib_com/options.h