Merge "Updates to SuggestionParser"