Pull request for issue #1247

Fixes #1247. Generated by conveyor-workflow.