TRQ-1528: valgrind errors.