Pull request for issue #817

Fixes #817. Generated by conveyor-workflow.