Needs to be merged after !671 (merged) as the custom roller was/is our largest pandas upgrading obstacle