Merge branch 'main' into 1305-omasa-ext-incorrect-output-with-object-editing