Pull request for issue #863

Fixes #863. Generated by conveyor-workflow.