Merge remote-tracking branch 'origin/main' into 1680_basop_port_object_editing_implementation