closed #2691 closed #2692 closed #2693