Update doc
Merge branch 'hotfix-3.1.0.1' into develop