Improvements to RTargetGroup intropsect

Change-Id: I6a923099bface1bcdc970e36a0b1e7ac86412df7