Merge change 8616 into donut

* changes:
  Fiddle with default densities to try to sanitize the API.