Merge pull request #3239 from usev6/patch-1