GDS-1109 Should not always cleanup data context thread