Pull request for issue #1037

Fixes #1037. Generated by conveyor-workflow.