Pull request for issue #1473

Fixes #1473. Generated by conveyor-workflow.