Test update for client fields
Merge branch 'develop'