Removed slow initialisation of local store.
Merge remote-tracking branch 'origin/next' into osx_bugfix