Merge remote-tracking branch 'origin/main' into 1942_fix_assertion_reverb