Rerolling the patch against 8.9.x-dev branch.