updates for changes for group workspaces.  Also update prior to merge from 2.0.7 branch
updates for changes for group workspaces.  Also update prior to merge from 2.0.7 branch
nate-rcl/irplus,nate-rcl/irplus