[SR-Dev] TLS merge