Fixes syntax error
Merge branch 'dev-range-context' into dev