Merge changes Ib72f6a1c,I46d798fa

* changes:
  Update add resizetasks to work in update
  Keeping naming consistent