StateModel: Don't hide final states
Merge remote-tracking branch 'origin/2.0'