Improvements to RTargetGroup intropsect

Change-Id: I8b61775302e3e4343024f4993c67a5abd4a6c9b9