Merge branch 'main' into 20240425_OSS_attribution_FhG