Dragonfly part 3 and fixes
Resolve conflict
Merge pull request #1237 from waveney/wav31

 Dragonfly part 3 and fixes