waves->wavesCBC and make it at runtime

Merge request reports