Wave 5 reveal.
Fix typo
Merge branch 'feature/wave5'