Merge "Revert implict min update interval to 1/6 of interval" into sc-dev