>>Can you update that patch to apply to the setup-200303-troubleshooting >>branch? > > > To Robert: > > What is the eventual fate of this branch? Once all the code is reinstated... Merge back into HEAD and setup-200303. Cheers, Rob