Merge pull request #1529 from wpaulino/move-channel-config-static-fields