Pull request for issue #1377

Fixes #1377. Generated by conveyor-workflow.