Merge the new patch which compiled ok