Merge branch 'release/0.7.1' into develop
Fix sample code for site testing
Merge branch 'develop'