Pull request for issue #897

Fixes #897. Generated by conveyor-workflow.