Added upstream patch