Merge pull request #3950 from mprins/patch-1