Pull request for issue #1397

Fixes #1397. Generated by conveyor-workflow.