Issue 3304