Disconnects Store
state fields from Compiler
#1761
Merged
Store
state fields from Compiler
#1761