Pull request for issue #1237

Fixes #1237. Generated by conveyor-workflow.