Pull request for issue #997

Fixes #997. Generated by conveyor-workflow.