Issue XXXX by tj: Updated branch and removed patch