change validation for extension in context ranges
Merge branch 'master' into extension_validation
Merge branch 'extension_validation'