Pull request for issue #1407

Fixes #1407. Generated by conveyor-workflow.