Merge branch 'fix/wavetable'