Bump Client
Merge branch 'develop'