Pull request for issue #1121

Fixes #1121. Generated by conveyor-workflow.