Merge remote-tracking branch 'origin/pr/2358' into mbedtls-2.16