Pull request for issue #977

Fixes #977. Generated by conveyor-workflow.