Merge pull request #2989 from boboldehampsink/also_sort_by_handle

Sort fields secondarily by handle to fix order flakiness

src/services/Fields.php

@@ -1394,7 +1394,7 @@ private function _createFieldQuery(): Query
                 'fields.settings'
             ])
             ->from(['{{%fields}} fields'])
-            ->orderBy(['fields.name' => SORT_ASC]);
+            ->orderBy(['fields.name' => SORT_ASC, 'fields.handle' => SORT_ASC]);
     }
 
     /**