Pull request for issue #597

Fixes #597. Generated by conveyor-workflow.