And investigate back-porting those changes to older release branches. Make the change before the 8.0.0 release.