Update the patches according to the upstream changes.
rebased onto 41cac1c72901b52fda9594ce07516d044f4871d1
Pull-Request has been closed by grizzlyuser
Update the patches according to the upstream changes.