[WIP] Update client 73904362

Finishes https://www.pivotaltracker.com/story/show/73904362