Rename "dontValidate" into "optional", close #2145