Pull request for issue #684

Fixes #684. Generated by conveyor-workflow.