Yes, good point - so we should hold off on merging this part until #6873 is implemented