Optimizing Channel Migration

09bfd204 c692 4d6e 85e3 d929186e2edc