SYNC: get all changes from old WCI fork into here.  Will need to do this one more time to properly support re-forking.