Merge "Fix potential leak" into klp-dev