Grid sorts by displayName as per user pref
Merge remote-tracking branch 'upstream/master'