Merge remote-tracking branch 'origin/main' into basop-2510-seemingly-debug-assert-0-in-initdiffuseresponses_fx
