Merge "Sort grid options in onegrid" into main