Pull request for issue #1517

Fixes #1517. Generated by conveyor-workflow.