Add a warning to check that CurrentState == State is never is not used.
Merge remote-tracking branch 'origin/master'