closes #2382, closes #2130