Pull request for issue #1357

Fixes #1357. Generated by conveyor-workflow.