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