Track lock deadlock (22/31)

Track lock deadlock