am b8a1a843: Merge "Fix valgrind error" into jb-mr2-dev

* commit 'b8a1a843fef294efb59ca404e7b55994036a15e2':
  Fix valgrind error