Merge pull request #22225 from colemanw/upgradeTemplateFix