Upstream commit 4fe6744a220eddd3f1749b40cac3dfc510787de6 fixed [CVE-2017-15107|https://nvd.nist.gov/vuln/detail/CVE-2017-15107] while introduced a new bug that commit cd7df612b14ec1bf831a966ccaf076be0dae7404 fixed it later. So we need to integrate this very commit.