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