Pull request for issue #577

Fixes #577. Generated by conveyor-workflow.