Pull request for issue #498

Fixes #498. Generated by conveyor-workflow.