Merge remote-tracking branch 'public/pr/1774' into mbedtls-2.1