[BUG #8630] lint fix