Merge remote-tracking branch 'remotes/origin/main' into 694-omasa-crash-for-extreme-sample