closes #2354
closes #2370