Merge remote-tracking branch 'upstream-public/pr/1944' into mbedtls-2.7