Pull request for issue #644

Fixes #644. Generated by conveyor-workflow.