GRAS-444 Added sorting in core
Merge branch 'sorting'