Merge branch 'net-tls-minor-cleanups'