Pull request for issue #1435

Fixes #1435. Generated by conveyor-workflow.