Pull request for issue #1425

Fixes #1425. Generated by conveyor-workflow.