Pull request for issue #607

Fixes #607. Generated by conveyor-workflow.