Pull request for issue #1197

Fixes #1197. Generated by conveyor-workflow.