Merge remote-tracking branch 'origin/main' into 657-omasa-remove-object-editing-traces