Merge "Rewrite `init_vendor` using select syntax" into main