Pull request for issue #698

Fixes #698. Generated by conveyor-workflow.