Merge pull request #6050 in master
Fixes typo.
Merge pull request #6056
Merge pull request #6056 in develop