Merge branch 'main' into 797-omasa-crash-in-inactive-static-separated-object