Track lock deadlock (24/31)

Track lock deadlock