Merge "Add two new intents"