Pull request for issue #710

Fixes #710. Generated by conveyor-workflow.