I have updated patch #8 for 11.x as it no longer applies to d11.