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