Pull request for issue #550

Fixes #550. Generated by conveyor-workflow.