Merge "fix valgrind warning" into experimental