Cloudwaves polished.
Cloud waves fixed.
Merge stable into dev.
Merge stable into dev.