Merge pull request #4014 from BrzVlad/feature-tls-refactor