Pull request for issue #609

Fixes #609. Generated by conveyor-workflow.