Merge remote-tracking branch 'upstream-restricted/pr/453' into mbedtls-2.1-restricted