Fix to state logic for QC in progress
Merge branch 'master' into andrew_state_rules
Re-generate assets