Merge pull request #517 from ccdle12/2020-02-per-channel-config