Pull request for issue #1169

Fixes #1169. Generated by conveyor-workflow.