Pull request for issue #738

Fixes #738. Generated by conveyor-workflow.