Merge remote-tracking branch 'remotes/origin/main' into 20240618_OSS_attribution_basop