Added local handler start boolean into StateUtilities.
Refactoring.
Refactoring.
Merge branch 'JP'