Merge pull request #4793 from tijoytom/master