PORT-128: Same F****** PROBLEM WITH TRANSPORT HANDLES AS PREVIOUS COMMIT