Upstream merge, and fix 'inp' with per-channel prefixes