Merge branch 'tls-fixes'