Improvements to RTargetGroup intropsect

Change-Id: Idb637d308720db34416a338593a1ebfca3afc45b