Rerolled patch against more recent version of 8.0.x, but not against the latest (yet).