[security-dev] IdentityStore changes