This is the final work we expect to do in 2.5.x cycle that will culminate with stable 2.6.0 release.