Pull request for issue #1207

Fixes #1207. Generated by conveyor-workflow.