- added fixes from upstream
- rel 3