Pull request for issue #1321

Fixes #1321. Generated by conveyor-workflow.