Merge "Add TLS protocol configuration"