Merge pull request #4870 from PetrusZ/fix/buildx