Clients cycle
Merge branch 'mikedev'