[GAIA BUG997599] - Lint fixes