Track lock deadlock (6/31)

Track lock deadlock