sort item on mac
Merge branch 'v2.1.12' into testing