Commit 44103b4c authored Jul 12, 2023 by Jouni Paulus

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

# Conflicts:
#	lib_com/options.h