Pull request for issue #1499

Fixes #1499. Generated by conveyor-workflow.