Merge branch 'hotfix/5424'

Close #5424
Fixes #3104
fix typo
Merge pull request #5438
Merge pull request #5438 in develop