Merge "Add a check for misspelled span change." into nyc-dev