the patch is getting too big, things still work for sview.  Quite a bit of infrastructure change to allow sview to work cross-cluster