Merge feature/stalibization into master branch
Merge master into feature/stalibization branch