Adding a patch that is compatible with 8.x-1.0-alpha9