Track lock deadlock (3/31)

Track lock deadlock