Merge pull request #23111 from eileenmcnaughton/silly3