Merge "Revert "Fixed the problem with the calendar sort order using the column name""