Merge "Clean-up Lint errors" into main