Merge "*_violators are here to stay -- bring up only though" into oc-dev