please review: Ticket 49675 - Fix latest coverity warnings