Merge "Some channel model updates"