Pull request for issue #556

Fixes #556. Generated by conveyor-workflow.