Merge "Address linter errors" into main