Merge "Use binder-based iterator to retrieve FRROs" into sc-dev