Merge branch 'nokia/contribution-omasa-combined-format' into...

Merge branch 'nokia/contribution-omasa-combined-format' into va/contribution-omasa-combined-format-fixes