Merge feature/stabilizaion on master