Fix SSLProtocolException
Merge branch 'fix_SSLProtocolException'