Merge remote-tracking branch 'origin/main' into 1680_basop_port-object-editing-API