Change for VIX-163.
Changes for VIX-187
Merge work from jeffu (waveform improvements).