[INTEGRATION] More speedup for update