Pull request for issue #552

Fixes #552. Generated by conveyor-workflow.