PROBCORE-215 cleaning up StateSpace
Merge remote-tracking branch 'origin/develop' into develop