Merge branch 'feature_client'