Merge pull request #3101 from frison/STORM-1515

STORM-1515: Fix LocalState Corruption