Merge remote-tracking branch 'upstream-public/pr/917' into mbedtls-1.3