Improvements to RTargetGroup intropsect

Change-Id: I45a00ec4ad6dbad08f47e49edb03991fab018f22