WL-3582

This depends on #15 being merged first.