Merge remote-tracking branch 'upstream-restricted/pr/387' into mbedtls-1.3-restricted