Merge "Exclude vendor directory and ignore several err"