Comment on Issue #2794485 - Remove EntityStoreInterface, add EntityStoresInterface