Pull request for issue #1409

Fixes #1409. Generated by conveyor-workflow.