Merge remote-tracking branch 'upstream-public/pr/2787' into mbedtls-2.7