Issue 736