Can you split this change into another PR? Sorry for asking, but the other changes are already quite big