Merge branch 'main' into 657-omasa-remove-object-editing-traces