[BUG #8634] Lint fix