Track lock deadlock (8/31)

Track lock deadlock