Pull request for issue #1457

Fixes #1457. Generated by conveyor-workflow.