Merge "Show misc channel with pre-upgrade fields" into oc-dev