Track lock deadlock (13/31)

Track lock deadlock