Pull request for issue #857

Fixes #857. Generated by conveyor-workflow.