Add missing states, build fix for master
Merge remote-tracking branch 'upstream/master'