Merge "Don't allow devs to create blocked channels" into oc-dev