Pull request for issue #837

Fixes #837. Generated by conveyor-workflow.