Merge plan for the On-Waves branch to master