Adds possibility to configure a default sorting rule for Grid
Merge branch 'origin/master'