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