Merge pull request #21396 from seamuslee001/fix_upgrade