Merge pull request #399 from FrozenNode/dev

Merge 4.8.0 into master
Merge pull request #436 from FrozenNode/dev

Merge 4.9.0 into master