Couldn't this be added in a dedicated PR? It could then be merged faster into master.