Pushed latest bug fixed code for TCP to Gitlab

Assigned To: