Improvements to RTargetGroup intropsect

Change-Id: I3dbc1c94386cf2f19f90ea201ca37b1555af0f08