Pull request for issue #1421

Fixes #1421. Generated by conveyor-workflow.