Align combi ad-channel support from t7suite.