Merge "NuCachedSource2: fix disconnect process" into lmp-dev