Merge pull request #22702 from ankathur/repackaged-int

Repackaged upgrade