Improvements to RTargetGroup intropsect

Change-Id: I7b4499b08a6a025380ef5234ce5d53be5aa6338d