Reset contexts before making store configuration changes. Hopefully fixes deadlock on reset.
Merge with master