Merge "don't pin ranking updates at the end of the queue." into nyc-dev