PIM-1494 Add channel selection on processor
CS fixes