[post-merge review] Fix and test vendor pull