Merge "Fix memory leaks detected by Valgrind" into devel/master