Many changes (see Changelog)
Merge pull request #671 from nZEDb/dev

Many changes (see Changelog)