Merge branch 'main' into 147-sig-activity-changes

# Conflicts:
#	core/constants.py
#	pyproject.toml

providers/activityrefdata/file_download_activity_ref_data_provider.py

@@ -34,7 +34,7 @@ class FileDownloadActivityRefDataProvider(ActivityRefDataProvider):
     def stop(self):
         super().stop()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.sig_name} activity ref data worker thread did not exit on time and will be killed.")