Changes to sub
Merge branch 'v1.1' into v1.0