Pull request for issue #1523

Fixes #1523. Generated by conveyor-workflow.