guide:solve the guide is under dss----add guide_restack()
Merge remote-tracking branch 'origin/master' into develop