Merge "Fix WaveGenerator memory leak" into nyc-mr1-dev