Merge remote-tracking branch 'upstream-restricted/pr/476' into mbedtls-2.7-restricted