Track lock deadlock (25/31)

Track lock deadlock