Merge "Fix heap data leak vulnerability" into klp-dev