We shouldn't forget to include it in 0.2.5.x-stable. Maybe backportable? Any other things to consider?