Merge change 7696 into donut

* changes:
  add hidden Options field for native allocations