Merge "Baseline global lint errors" into main