Merge "AID: Change loop to repeat and set from xml"