Merge remote-tracking branch 'origin/main' into nokia/fix-masa-test-vector-names