Merge "Fix channel configurability check"