Merge remote-tracking branch 'remotes/origin/main' into 20250827_maintenance_BASOP