Merge "Update cross section (entries grouped by entryGroupId) ranking logic" into main