Fix feature_2 bug
Merge branch 'release-1.0' into develop