Improvements to RTargetGroup intropsect

Change-Id: I5eafa9ee251e61ec85939af30af7b9d3164bd16a