Pull request for issue #1147

Fixes #1147. Generated by conveyor-workflow.