Merge commit '18624e76' into...

Merge commit '18624e76' into nokia/contribution-omasa-combined-format