Fixing sort issue on characteristics
Merge branch 'develop'