Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev