Merge branch 'client'