Those changes should be in a separate PR :-)