Pull request for issue #1395

Fixes #1395. Generated by conveyor-workflow.