Added sorting by name, fixed errors
Merge branch 'i20977' into development