Pull request for issue #823

Fixes #823. Generated by conveyor-workflow.