Merge branch 'feature/stabilization'