NXP-11429: Implement suggestionHandler merge