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