Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev