Merge "ResetLockoutClients cancel preceding clients." into tm-dev