Merge "Sort transitions by ID instead of row ID" into main