Do you mind separating the validation change from the template case sensitivity one?