Track lock deadlock (5/31)

Track lock deadlock