Merge "Insert missing breaks" into oc-dev