Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev