Merge "Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup" into jb-dev