Pull request for issue #1489

Fixes #1489. Generated by conveyor-workflow.