Merge "Add capability to send tls server port" into main