Backmerging TLS client fix
Recording .gitmergeinfo Changes