Merge pull request #4965 from xkqian/add_client_finished

Add client finished