Pick up cstate changes for #6

3 jobs for bug_6_v2 in 18 seconds (queued for 1 second)