Merge "remove some restrictions on effect output channels" into lmp-mr1-dev