After PR #1042 is merged, fold relevant changes into the TLB channel driver.
After PR #1042 is merged, fold relevant changes into the TLB channel driver.