Merge remote-tracking branch 'remotes/origin/main' into cleanup_20250422