Pull request for issue #658

Fixes #658. Generated by conveyor-workflow.