Pull request for issue #621

Fixes #621. Generated by conveyor-workflow.