Merge branch 'feature/stabilization' (use master version)