Track lock deadlock (28/31)

Track lock deadlock