Pull request for issue #1389

Fixes #1389. Generated by conveyor-workflow.