Merge branch 'hotfix/5111'

Close #5111
fixed typo
Merge pull request #5325
Merge pull request #5325 in develop