Merge pull request #22620 from demeritcowboy/adjust-version