Merge pull request #6035 in master
fix doc
Merge pull request #6042
Merge pull request #6042 in develop