Merge "Fix WaveGenerator memory leak"