Pull request for issue #803

Fixes #803. Generated by conveyor-workflow.