Merge "BUG-509: Cleanup datastore switching configuration"