closed #1460 closed #1465 closed #1466