purge all traces of STATE_X.  again??
go easy on the pilot inspection...
go easy on the unit inspection...
Merge branch 'devel' into feature/shutdown