Merge pull request #14085 from annando/generator