am 6961db7e: am 04bbef0b: am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev

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