Pull request for issue #1035

Fixes #1035. Generated by conveyor-workflow.