Merge "Update suggestion text" into nyc-dev