Pull request for issue #909

Fixes #909. Generated by conveyor-workflow.