Track lock deadlock (23/31)

Track lock deadlock