Enabled TLS support
Revert last commit
Merge branch 'master' into develop