Merge branch 'tr/valgrind'