Merge branch 'feature/enhance_client'