Merge "Make ExternalStore wrap ExternalStoreFactory and create access class"