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