Merge "Add alternate intents support" into main