Add ObjectStore
Merge pull request #10154 from expensivegasprices/master

Add ObjectStore