Pull request for issue #1477

Fixes #1477. Generated by conveyor-workflow.