  - update after upstream accepts patch and releases
  - test?
