Merge "ExternalStoreDB.php was moved to externalstore folder in c37937"