I just realized it actually is part of this patch. Can I ask for a better name then?