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