Merge branch 'main' into 1942_fix_assertion_reverb