Manually applied because of upstream patch file issues. Upstream 73597ed865e92dbfad404b69eb6468fb7e129ad2