Merge pull request #15531 from eileenmcnaughton/silly_template