channel info in build script
Merge remote branch 'upstream/development' into development