Pull request for issue #706

Fixes #706. Generated by conveyor-workflow.