Merge branch 'memcheck-fix' into development