Merge pull request #19773 from stintel/announce