Merge pull request #4148 from sabased/patch-1