Track lock deadlock (4/31)

Track lock deadlock