Merge remote-tracking branch 'origin/main' into nokia/masa-diff-tool