See #819. Adding additional patch files.