Make sure to sort commits before doing step-before change