Merge "Service objects for iag and eag"