Merge remote-tracking branch 'remotes/origin/va/omasa_updt' into nokia/contribution-omasa-combined-format
