Merge upstream
Rearrange vendor