stage v1.0
Merge branch 'stage-1.0' into develop