Merge pull request #1314 from TheBlueMatt/2022-02-accept_chan_type