Merge from vendor branch FILE: