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