Merge "Change how ranking time is calculated" into main