Please let me know if you have problems applying this patch (whitespace corruption for example). I tested it locally before pushing this and it worked fine on my end.