Merge feature/stabilization to master
Merge master into feature/stabilization