ok. Does this apply to the whole CMF? In anycase it makes sense to do this in batch as serparate PR(s)