Merge "Fix Lint error" into main