Merge change 271

* changes:
  Manually merge 129, 174, and 233 from donut