Merge change 8817 into donut

* changes:
  fix [2017532] Partial Update leaves residual image.