Merge remote-tracking branch 'origin/main' into nokia/new-masa-omasa-stv-testfiles