Pull request for issue #1481

Fixes #1481. Generated by conveyor-workflow.