Version 2.6.1
- Working release version
- Multiple bug fixes and merge resolves