This could be done in an independent PR, it's not related to the main changes.