#27 patch will only apply to 8.x-1.0-rc2