Merge remote-tracking branch 'origin/main' into 1362-omasa-rendering-to-masa-1tc-makes-objects-on-the-right-side-disappear
