Pull request for issue #704

Fixes #704. Generated by conveyor-workflow.