Improvements to RTargetGroup intropsect

Change-Id: Ic3d1de026792b31f1a96f98c90d1328dabf732ac