Pull request for issue #1417

Fixes #1417. Generated by conveyor-workflow.