Merge remote-tracking branch 'remotes/origin/Nokia/contribution-omasa-combined-format' into va/contribution-omasa-combined-format-fixes
