include field link to channelType and modify field id
Merge branch 'develop'