Adding a patch against 8.6.x