Duplicating fw.state into wf.fw_states
Merge conflict resolved