Track lock deadlock (10/31)

Track lock deadlock