Merge "Fix lint warnings" into main