Merge pull request #5761
Merge pull request #5761 in master
Fixes #4926