FS-5167 fix 2010 dependency
move callstate changes down to take place after the core states have run