FLUID-5542: Linting