Merge "waves: correct config to fix wrong tuning" into main