Merge pull request #8937 from lucize/doveup