Fix expr error.
Create scope hierarchy
Merge remote-tracking branch 'origin/master'