Yes, it applies to the whole CMF. And I think both ways (doing it in this PR and update the rest using a batch or using a batch for everything) are making sense