Merge "Fix T401 and T402 errors"