Merge pull request #4626 from aparcar/patch-2