update userguide manual link
Merge pull request #5523 in master
Merge pull request #5707
Merge pull request #5707 in develop