Issue 6795