Merge "Cyclic refresh: factor segment delta-q into rate control."