Improvements to RTargetGroup intropsect

Change-Id: I4142b89b4bfdb56bfc2628bc31d0f548af433e37