Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/nominatim_api/search/icu_tokenizer.py
Simple merge

diff --cc src/nominatim_db/tokenizer/icu_tokenizer.py
index 70273b90e0af59e43a6a58108ffb427b31b5a654,7cd96d591fcec97483a721542829f4da90e52430..4eee2c73b0c9a02001c8c0e49b9b88ab6da36c3b
--- 1/nominatim/tokenizer/icu_tokenizer.py
--- 2/src/nominatim_db/tokenizer/icu_tokenizer.py
+++ b/src/nominatim_db/tokenizer/icu_tokenizer.py
@@@ -192,9 -190,8 +190,9 @@@ class ICUTokenizer(AbstractTokenizer)
                                              END) as info
                                      FROM word LEFT JOIN word_frequencies wf
                                           ON word.word_id = wf.id
 +                                    ORDER BY word_id
                                  """)
-                     cur.drop_table('word_frequencies')
+                     drop_tables(conn, 'word_frequencies')
  
              with conn.cursor() as cur:
                  cur.execute('SET max_parallel_workers_per_gather TO 0')