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

* commit 'b21a642067477c72f419956da0ca8dafe0c04eab':
  DO NOT MERGE NuCachedSource2: fix possible erroneous early free