fix(states): Typo error and style fix
Merge remote-tracking branch 'upstream/devel' into devel