Fix race condition causing flakey tests in Storage tests
Merge remote-tracking branch 'upstream/master' into store-settings
First working draft