Merge "Use apexservice to get the list of apexes" into main