Merge pull request #4164 from abooij/issue-4156