Pull request for issue #740

Fixes #740. Generated by conveyor-workflow.