Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev