Merge "Added check for vendor module to parse-and-fix-errors"