I installed these patches, along with the attached further patch along the same
lines.