Added patch against 8.x-1.0-alpha1 branch