Track lock deadlock (17/31)

Track lock deadlock