Pull request for issue #718

Fixes #718. Generated by conveyor-workflow.