- Reintegrated branches
- Fixed warnings