Merge "Move keystore from user_tags to core req"