Merge remote-tracking branch 'remotes/origin/main' into 797-omasa-crash-in-inactive-static-separated-object