Add upstream patch to fix #6593, thanks to Ozan for notification -- Never learn by your mistakes, if you do you may never dare to try again.