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