Minor changes.
Fixed conflicts.
Merge branch 'master' into topic/multichannel-scheduling