Pull request for issue #1521

Fixes #1521. Generated by conveyor-workflow.