Merge branch 'nokia/contribution-omasa-combined-format-refactor-merge' of...

Merge branch 'nokia/contribution-omasa-combined-format-refactor-merge' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into nokia/contribution-omasa-combined-format-refactor-merge