Re-rolled against 9.1.x-dev .