Merge pull request #6446 from annando/approve