* commit '01119de91d28d6e053ba2365ae6b1b03276446f0': Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup