Merge pull request #5062 from SvenRoederer/issue_5051