#  git cherry-pick -n 6b67c18d8927cf7f982a1feac867c301211a186e                        # scons: Sort help text with a custom function that will run on Python 3 *
  git cherry-pick -n 9d333bc95a555bee88d5f09f3ff6777cc5c313cb                        # Compare to `None` using identity `is` operator
  git cherry-pick -n 2b1ebdc2047a75b1d0dc5724f8b91bef150d9c3c                        # utils/codelist: Fix TypeError that occurred on any input
  git cherry-pick -n 4e8d8e844a7c0bd53ae2e8fe6ba5d1cd0ceaea28                        # utils/codelist: Convert to python3
  git cherry-pick -n --strategy-option=ours 9982afb21fef752b46a4162bb2a26ef609bd3279 # Ported expand-terrain-macros to Python 3
  git cherry-pick -n 75ca522a5b8bce8cf5a49c6745eaaeccd22dddcc                        # Fix addon manager crash if not finding the add-on (#3874)
  git cherry-pick -n --strategy-option=ours 2863db36cc81b5b4b8dc7346b71b16f948d80862 # Removed the unused scoutDefault Python tool
  git cherry-pick -n --strategy-option=ours b8965178348fab03718fb4b7fb798e8427d7cbb9 # Removed unused journeylifter Python tool
  git cherry-pick -n --strategy-option=ours 1fe32ff69d28f3bbefde68f6b4eae848576d35c0 # Ported wmlflip to Python 3
  git cherry-pick -n b4d855caadd230edc24048591c534028dbd30b51                        # Updated the shebang of two Python 3 scripts
  git cherry-pick -n --strategy-option=ours dbe9d60c1f174d911fb70a1f9f8af46133affc9b # Removed utils/wescamp_import script
  git cherry-pick -n --strategy-option=ours 5654b4c929a30d8b0ee6609f2ca1085f4a3b1d1a # Removed broken wmlvalidator Python script
#  git cherry-pick -n --strategy-option=ours af64a10d50640937a6379904f8be33327225cae0 # Ported umc_dev/build/update_version to Python 3 *
  git cherry-pick -n --strategy-option=ours a830561dd03bc7dd40e67968c31c2699dbb3bc27 # Ported wmlparser to Python 3
#  git cherry-pick -n --strategy-option=ours 4f667254c9af792147fa0740e5944d21b7e79095 # Ported wiki_grabber to Python 3 *
#  git cherry-pick -n --strategy-option=ours ffc5edd3fe0f46762f3addf5b5af60c4a14abd0f # Ported ai_test to Python 3 *
#  git cherry-pick -n --strategy-option=ours 636f29b0b96bc9dae3637a7e6d259a9e4b788fa1 # Ported unused_functions to Python 3 *
  git cherry-pick -n --strategy-option=ours 3a8dc9c361d8f5f54a764147cff3a81fbf0e4aed # trackplacer3 a utility to export and import tmx files (#4365)
  git cherry-pick -n 3ed601bb916c1b7b2525184e0fa9e6fdb37745d7                        # Added tool to automatically add <release> tags to appdata
  git cherry-pick -n 42293897e563d0caad814aea260342662d74096c                        # Add dockerfile for making mingw cross-compile builds *
  git cherry-pick -n --strategy-option=ours d2ee0f4b73eec0ea6702b4dad168d569836aec12 # Move appdata script to a more appropriate place
  git cherry-pick -n 2c9caab3cee5c36e4612d27cc50ec6ae0a458eb4                        # Add trackviewer, remove trackplacer
  git cherry-pick -n d4adce6c8683100868f52d804ba78c501d00984d                        # Explicitly use python3 in translations *
  git cherry-pick -n c1e4178338a3d5b65c152de75e59999380d060f7                        # Disambiguate some python shebang lines to be "python3"
  git cherry-pick -n --strategy-option=ours ebbd9c5dfa41e2330624a73d494f733b81d77695 # Remove the python2 rmtrans tool (#5014)
  git cherry-pick -n --strategy-option=ours 935fa41379b936ee1633868e6798176505ef29f6 # Final part of the Python 2 removal, including updating install-pytools (#5027)