Merge branch '571-reverb-not-activated-for-discrete-and-parametric-ism' '571-reverb-not-activated-for-discrete-and-parametric-ism-draft'