Merge branch 'eb-update-wax' into 'develop'

Refactor to new Wax interface

See merge request !6