Pull request for issue #1401

Fixes #1401. Generated by conveyor-workflow.