Fixes #4963
Merge pull request #5131 from medihack/dev

Fixes #4963