Merge pull request #4774 from lucize/doveup