Merge change 546 into donut

* changes:
  Add (hidden for now) purgeable bitmaps