Merge "Only expand `{{...}}` in messages once (part 2)"