Merge remote-tracking branch 'origin/main' into basop-2496-omasa-object-editing-path-has-wrong-assignment
