Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev