Merge "Fix lint errors" into main