Merge branch 'js/valgrind'