Pull request for issue #422

Fixes #422. Generated by conveyor-workflow.