Apply TLS1.1 and TLS1.2 Patch from issue #16692