Pull request for issue #1221

Fixes #1221. Generated by conveyor-workflow.