Pull request for issue #1347

Fixes #1347. Generated by conveyor-workflow.