Track lock deadlock (30/31)

Track lock deadlock