Merge "Channel settings updates" into oc-dev