move to new scope parser
Merge branch 'scope'