Merge "Fix oscillations on ICS"