Merge change 21031

* changes:
  Should clear background.