Fix error while merging branch 'origin/feature/stabilization'