Pull request for issue #1203

Fixes #1203. Generated by conveyor-workflow.