Track lock deadlock (18/31)

Track lock deadlock