Issue 717