Merge "Optimize coef update"