SFR-17 #comment added lowercase channel type control
Merge branch 'SFR-17'