Merge branch 'vendor/FILE' (early part)