Track lock deadlock (21/31)

Track lock deadlock