ISSUE-107 Lint