We should probably merge #2418 first then?