Pull request for issue #694

Fixes #694. Generated by conveyor-workflow.