Merge pull request #9940 from annando/speed