Pull request for issue #630

Fixes #630. Generated by conveyor-workflow.