Merge "Added waveform data support"