Merge remote-tracking branch 'origin/main' into FhG/object_editing_interface