Merge "trappy/utils: Replace deprecated DataFrame.sort with DataFrame.sort_values"