Track lock deadlock (7/31)

Track lock deadlock