Merge "BUG-509: make the tree-based datastore the default"