Merge pull request #6056 in master
fixed typo
Merge pull request #6062
Merge pull request #6062 in develop