DDBEASY-157 - Adds sorting.
Merge branch 'DDBEASY-157' into develop