already have this in `release_1.5.0`
should be a relatively easy transition for these...