Pull request for issue #1501

Fixes #1501. Generated by conveyor-workflow.