Merge feature/statbilization into master branch
Merge master into feature/statbilization branch