Merge "Fix valgrind error." into jb-mr2-dev