Merge "Fix alternate intents in the intent refinement call." into tm-qpr-dev