Merge commit 'ab80b39f160a07bf7bd18a84c07c7e2acedb7249' * commit 'ab80b39f160a07bf7bd18a84c07c7e2acedb7249': Fixed valgrind handling issue.
Merge commit 'ab80b39f160a07bf7bd18a84c07c7e2acedb7249' * commit 'ab80b39f160a07bf7bd18a84c07c7e2acedb7249': Fixed valgrind handling issue.