FLUID-4599: Linted