Merge branch 'main' into basop-2469-object-editing-artifacts-in-basop