Track lock deadlock (15/31)

Track lock deadlock