closed #2459
closes #2457
closes #2436