Create and set MockStorageFactory.
Merge branch 'origin/develop'