Merge "Introduce new intent action to set parent challenge"