Pull request for issue #678

Fixes #678. Generated by conveyor-workflow.