GNR-18 - changed aa_inst_id to i-Id