Merge branch 'master' into Expiry_and_schedule
Get channels and send on channels
Merge branch 'Get-channels'