Merge change 8752 into donut

* changes:
  Updates from API review.