instead of having a map of states in each client Refs #74722 Change-Id: Ia43d2f77723cbfbe7a97a02c02bf16b95a53649b