Merge branch '694-omasa-crash-for-extreme-sample' into 'main'

[non-BE] Resolve "OMASA crash for extreme sample"

See merge request !958