Merge "Missed a break statement. very sorry" into oc-dev