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