Merge "Fix resource looping if AAI response empty"