Re-rolling the patch against 9.1.x-dev.