Pull request for issue #869

Fixes #869. Generated by conveyor-workflow.