Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev