Merge pull request #5350 in master
fixed typo
Merge pull request #5360
Merge pull request #5360 in develop