Pull request for issue #1009

Fixes #1009. Generated by conveyor-workflow.