Fix/9493 sorting

Merged Sébastien DA ROCHA requested to merge fix/9493_sorting into development

Merge request reports