client revisions
Merge branch 'client-revisions'