Fixed TC-2074: Static analysis issues