Fix guider typo
Merge branch 'release-0.7' into develop