Merge "Put the donut on a diet." into oc-dr1-dev