Merge branch 'docs/clients-update' into 'develop'