fix TROPO-2493 Dead locks on Tropo staging 203.