- imported upstream fixes
- rel 2