Merge branch 'tr/valgrind-test-fix'