Merge feature/stabilization on master