Pull request for issue #1217

Fixes #1217. Generated by conveyor-workflow.