Ported patch for channel disposal in direct aggregation.
Ported patch for channel disposal in direct aggregation.

Former-commit-id: 329d675706aa5d971b9c43db04c0bf52e9a6a7b1
jolie/jolie,jolie/jolie,jolie/jolie