Pull request for issue #1471

Fixes #1471. Generated by conveyor-workflow.