Merge pull request #22306 from cotequeiroz/python3-rebuild