Symfony baseStore update to support mixed id (publicKey and Store