Merge "Some rate control adjustments to control overshoot"