Merge "Fix memory leak in error case" into klp-dev