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