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