Improvements to RTargetGroup intropsect

Change-Id: I7e093485409111dfc51685bf701b002bf84b9ce8