Feature/#96 robustness in sorting

Merged Michelle Weidling requested to merge feature/#96-robustness-in-sorting into develop

Merge request reports