Pull request for issue #1027

Fixes #1027. Generated by conveyor-workflow.