Pull request for issue #1469

Fixes #1469. Generated by conveyor-workflow.