Merge pull request #2044 from freddiekrugerrand/1782-limitchannelhints