Merge "Get a hack in place for broken quotas." into oc-dev