Merge "Revert "Skip primaryRangeIsSingleRate check for ARR"" into main