Rebase to 12.7.1
Fixed: Sort methods