Merge feature/stabilization branch on master