Start work on #596 to get in 2.5.0