CON-1707: Code linting