Track lock deadlock (16/31)

Track lock deadlock