Filed as #1076