Merge "Lint bug fixes"