closed #2459 closed #2460 closed #2461