Merge "Changed FillResponse so it can have only a client state."