Merge "Support changes to SuggestionParser"