Updating from min branch.
Adding user_name_sort_by support.